Merge branch 'wip/otte/for-master' into 'master'

Wip/otte/for master

See merge request GNOME/gtk!2855

diff --cc gsk/gl/gskglrenderer.c
Simple merge

diff --cc gsk/gskrendernode.h
Simple merge

diff --cc gsk/gskrendernodeimpl.c
index b104372baf387b583622efb61851f13bfb3c4d98,158a35fa2cda0e60bb73402899badb78465a4921..e5228d88c9fd2c575c705a9d163e23d47e933b32
--- 1/gsk/gskrendernodeimpl.c
--- 2/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@@ -940,12 -940,11 +940,12 @@@ gsk_border_node_get_outline (GskRenderN
   *
   * Retrieves the stroke widths of the border.
   *
 - * Returns: (transfer none): an array of 4 floats for the top,
 - *     right, bottom and left stroke width of the border
 + * Returns: (transfer none) (array fixed-size=4): an array of 4 floats
 + *   for the top, right, bottom and left stroke width of the border,
 + *   respectively
   */
  const float *
- gsk_border_node_peek_widths (GskRenderNode *node)
+ gsk_border_node_get_widths (GskRenderNode *node)
  {
    GskBorderNode *self = (GskBorderNode *) node;
  

diff --cc gsk/gskrendernodeparser.c
Simple merge

diff --cc gtk/meson.build
Simple merge